Correct marshaller for switch-page and adjust emission from menu

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=624687

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 65b7ee0c95f230cd0b32d6dbf9ec9d6d3d386d15..b911c73d67fa1cc1edcec17dc453cef58760ff2f 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -832,7 +832,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkNotebookClass, switch_page),
                  NULL, NULL,
-                 _gtk_marshal_VOID__POINTER_UINT,
+                 _gtk_marshal_VOID__OBJECT_UINT,
                  G_TYPE_NONE, 2,
                  GTK_TYPE_WIDGET,
                  G_TYPE_UINT);
@@ -6235,7 +6235,7 @@ gtk_notebook_menu_switch_page (GtkWidget       *widget,
   g_signal_emit (notebook,
                 notebook_signals[SWITCH_PAGE],
                 0,
-                page,
+                page->child,
                 page_num);
 }